If indent is negative, don't move the first line out into the margin,

2000-11-15  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextlayout.c (set_para_values): If indent is negative,
	don't move the first line out into the margin, instead move the
	whole paragraph in order to make space for the first line within
	the margin

diff --git a/ChangeLog b/ChangeLog
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d5242787ca8e74628b46ac088c9d321cf31d1d77..2aa3385d213a2a3f475989a80cb16693d4519d46 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2000-11-15  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (set_para_values): If indent is negative,
+       don't move the first line out into the margin, instead move the
+       whole paragraph in order to make space for the first line within 
+       the margin
+
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (changed_handler): offset redraw rect by

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index fe5cbf31dcd55239ca6e727f1534128bbd8f0f5e..f6c1e755e456e0881ef34cec37a8ac574413c092 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1117,21 +1117,8 @@ set_para_values (GtkTextLayout      *layout,
   display->left_margin = style->left_margin;
   display->right_margin = style->right_margin;
   
-  if (style->indent < 0)
-    {
-      /* This means the margins can be negative. FIXME
-       * test that things work if they are.
-       */
-      
-      if (pango_align == PANGO_ALIGN_LEFT)
-        display->left_margin += style->indent;
-      else if (pango_align == PANGO_ALIGN_RIGHT)
-        display->right_margin += style->indent;
-    }
-  
   display->x_offset = display->left_margin;
 
-
   pango_layout_set_indent (display->layout,
                            style->indent * PANGO_SCALE);